Update main branch in preperation for default branch switch #4400
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: Form Purpose not saving to DB
* Fixes a server client boundary error * Fixes a TS declaration * Adds a check encase of invalid JSON * Fixes a typo
move refs provider
* reset locked groups
* Adds placeholder text for empty section * Adds placeholder to start section questions also * Displays text based on element type * Fixes language key * Adds default text for multi-element types
fix for stale state for action selectors
Co-authored-by: sre-read-write[bot] <92993749+sre-read-write[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bryan Robitaille <bryan.robitaille@cds-snc.ca>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* handle offboard * add custom url * Workaround for announcing a disabled or enabled dropdown --------- Co-authored-by: Peter Thiessen <peter.thiessen@cds-snc.ca>
* update button styles --------- Co-authored-by: Dave Samojlenko <dave.samojlenko@cds-snc.ca>
* update radio styles
error summary
* add styles
* Update compiled styles --------- Co-authored-by: Dave Samojlenko <dave.samojlenko@cds-snc.ca>
fix radio inputs
fix centering
Bufix for repeating set- finish conversion to using ids
* fix long text issue --------- Co-authored-by: Dave Samojlenko <dave.samojlenko@cds-snc.ca>
* add branding
fix banner copy
Co-authored-by: sre-read-write[bot] <92993749+sre-read-write[bot]@users.noreply.github.com>
* Improved error message for server-side file validation errors * distinguish between FileError and ServerError
Co-authored-by: sre-read-write[bot] <92993749+sre-read-write[bot]@users.noreply.github.com>
update styles
* Add customEvent hook for pub/sub pattern * simplify and add comments
…ly (#4387) Remove gray bg from Button icon theme and only apply selectively
fix more menu for add page text
Co-authored-by: sre-read-write[bot] <92993749+sre-read-write[bot]@users.noreply.github.com>
Update the Docker scan actions to use a self-hosted Trivy vulnerability database. This is being done to address the rate limiting of the publicly hosted database.
bryan-robitaille
requested review from
dsamojlenko and
timarney
as code owners
|
This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
Trivy found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
|
Need to take a different strategy because there has been drift between the two branches |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary | Résumé
Aligning all repos to use "main" instead of develop